Skip to content

Return an error when aborting due to existing .orig file (fixes #60) #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Return an error when aborting due to existing .orig file (fixes #60) #61

wants to merge 1 commit into from

Conversation

fmarier
Copy link

@fmarier fmarier commented Apr 18, 2019 •
edited
Loading

Using the same setup as described in #60:

$ ./patch.py --debug working.patch || echo Failed
   DEBUG reading working.patch
   DEBUG crlf: 0  lf: 5  cr: 0	 - file: b.txt hunk: 1
   DEBUG -  1 hunks for a.txt
   DEBUG total files: 1  total hunks: 1
   DEBUG normalize filenames
   DEBUG     patch type = plain
   DEBUG     source = a.txt
   DEBUG     target = b.txt
   DEBUG processing 1/1:	 a.txt
   DEBUG  hunk no.1 for file a.txt  -- is ready to be patched
 WARNING can't backup original file to a.txt.orig - aborting
Failed

@fmarier
Copy link
Author

fmarier commented Apr 18, 2019

That Travis CI failure is unrelated to my change and needs to be fixed with something like graingert@ba64f72.

@fmarier fmarier mentioned this pull request Jun 29, 2019
Merged
This was referenced Sep 27, 2019
Closed
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@fmarier